AMD IOMMU: Fix boot output on non-iommu system

Signed-off-by: Wei Wang <wei.wang2@amd.com>

diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c b/xen/drivers/passthrough/amd/pci_amd_iommu.c
index a66a7f52007f41b6a6b488fd4905106f8d564410..5d22289789ded605f7e7342c3932339640a32e33 100644 (file)
--- a/xen/drivers/passthrough/amd/pci_amd_iommu.c
+++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c
@@ -161,21 +161,15 @@ int amd_iov_detect(void)
 {
     INIT_LIST_HEAD(&amd_iommu_head);
 
-    if ( amd_iommu_detect_acpi() != 0 )
+    if ( (amd_iommu_detect_acpi() !=0) || (iommu_found() == 0) )
     {
-        AMD_IOMMU_DEBUG("Error detection\n");
-        return -ENODEV;
-    }
-
-    if ( !iommu_found() )
-    {
-        printk("AMD_IOV: IOMMU not found!\n");
+        printk("AMD-Vi: IOMMU not found!\n");
         return -ENODEV;
     }
 
     if ( amd_iommu_init() != 0 )
     {
-        AMD_IOMMU_DEBUG("Error initialization\n");
+        printk("Error initialization\n");
         return -ENODEV;
     }
     return 0;